Skip to content

Hide backup and scan activities from sites without backup access - #23218

Merged
crazytonyli merged 3 commits into
trunkfrom
bugfix/cmm-2130-filter-activity-logs
Aug 19, 2026
Merged

Hide backup and scan activities from sites without backup access#23218
crazytonyli merged 3 commits into
trunkfrom
bugfix/cmm-2130-filter-activity-logs

Conversation

@crazytonyli

Copy link
Copy Markdown
Contributor

…ccess

WordPress.com backs up Simple sites internally and writes those events to
the activity log regardless of plan, so the activity endpoint returns
backup ("rewind") and scan activities even for sites whose plan does not
include those products. The web Activity Log excludes them by sending
not_group[]=rewind&not_group[]=scan when the site lacks the
backups-self-serve feature, but the apps never did, causing the mobile
Activity Log to show "Backup and scan complete" entries that the web
hides.

This mirrors the web behavior (getActivityLogHiddenGroups in wp-calypso):
a new GetActivityLogHiddenGroupsUseCase decides which groups to hide
based on the backups-self-serve plan feature, falling back to purchased
Jetpack backup/scan products for self-hosted sites, and the activity log
fetch passes them through a new notGroups field on FetchActivityLogPayload
so the server filters them out. The activity type filter picker removes
the hidden groups from its list so they cannot be selected, and the
Backup screen keeps showing rewind events since that is its purpose.
@crazytonyli crazytonyli added this to the 27.1 milestone Aug 14, 2026
@dangermattic

dangermattic commented Aug 14, 2026

Copy link
Copy Markdown
Collaborator
1 Warning
⚠️ This PR is assigned to the milestone 27.1. The due date for this milestone has already passed.
Please assign it to a milestone with a later deadline or check whether the release for this milestone has already been finished.

Generated by 🚫 Danger

@wpmobilebot

wpmobilebot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

App Icon📲 You can test the changes from this Pull Request in Jetpack Android by scanning the QR code below to install the corresponding build.

App NameJetpack Android
Build TypeDebug
Versionpr23218-d15e0c7
Build Number1498
Application IDcom.jetpack.android.prealpha
Commitd15e0c7
Installation URL6okbobrl9ktto
Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

@wpmobilebot

wpmobilebot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

App Icon📲 You can test the changes from this Pull Request in WordPress Android by scanning the QR code below to install the corresponding build.

App NameWordPress Android
Build TypeDebug
Versionpr23218-d15e0c7
Build Number1498
Application IDorg.wordpress.android.prealpha
Commitd15e0c7
Installation URL749avgdda3on0
Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

@wpmobilebot

Copy link
Copy Markdown
Contributor

🤖 Build Failure Analysis

This build has failures. Claude has analyzed them - check the build annotations for details.

@nbradbury

Copy link
Copy Markdown
Contributor

@crazytonyli Overall this looks good, but Claude found a few issues, and checks are failing.

review-pr-23218-issues-2026-08-17.pdf

@crazytonyli

Copy link
Copy Markdown
Contributor Author

@nbradbury Are the two medium issues acceptable or blockers, in the context of this codebase? The first issue about standalone Jetpack Backup plugin sounds like an existing issue. I'm not sure how much real impact the second issue (querying from the main thread) has.

@nbradbury

Copy link
Copy Markdown
Contributor

Are the two medium issues acceptable or blockers, in the context of this codebase?

I don't consider either blockers, but the CI failure is a blocker.

@nbradbury

Copy link
Copy Markdown
Contributor

@crazytonyli I'll go ahead and approve this so you can merge it once the CI issue is resolved.

@nbradbury nbradbury left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@crazytonyli

Copy link
Copy Markdown
Contributor Author

@nbradbury Thanks for the review!

@crazytonyli
crazytonyli enabled auto-merge (squash) August 18, 2026 23:45
@codecov

codecov Bot commented Aug 18, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 91.66667% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 37.92%. Comparing base (52d78ca) to head (d15e0c7).
⚠️ Report is 1 commits behind head on trunk.

Files with missing lines Patch % Lines
...i/activitylog/GetActivityLogHiddenGroupsUseCase.kt 88.88% 0 Missing and 1 partial ⚠️
...ylog/list/filter/ActivityLogTypeFilterViewModel.kt 83.33% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##            trunk   #23218   +/-   ##
=======================================
  Coverage   37.91%   37.92%           
=======================================
  Files        2333     2334    +1     
  Lines      126964   126984   +20     
  Branches    17583    17589    +6     
=======================================
+ Hits        48144    48162   +18     
  Misses      74888    74888           
- Partials     3932     3934    +2     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@crazytonyli
crazytonyli merged commit 419039b into trunk Aug 19, 2026
21 of 23 checks passed
@crazytonyli
crazytonyli deleted the bugfix/cmm-2130-filter-activity-logs branch August 19, 2026 00:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants